From 055935cf6d7925378728bea9a68aa4e58807db4d Mon Sep 17 00:00:00 2001 From: "iap10@freefall.cl.cam.ac.uk" Date: Tue, 8 Feb 2005 15:43:01 +0000 Subject: [PATCH] bitkeeper revision 1.1159.223.80 (4208de05Xtv_u_3smJSRU6ex6bTAfA) Some functions aren't static and could be (damn C language!). I tried turning on -Wmissing-prototypes: unfortunately gives warnings for functions used in asm, which means introducing gratuitous prototypes for them. Not sure it's worth it. 1) keyhandler.c: keypress_softirq() and do_task_queues() can be static. 2) physdev.c: pcidev_dom0_hidden() can be static. 3) resource.c/resource.h: check_region is deprecated (racy): remove. 4) sched_bvt.c: lots of things can be static. 5) pci/compat.c: not required for Xen. Signed-off-by: Rusty Russell (authored) Signed-off-by: ian.pratt@cl.cam.ac.uk --- xen/common/keyhandler.c | 4 +-- xen/common/physdev.c | 2 +- xen/common/resource.c | 13 -------- xen/common/sched_bvt.c | 16 +++++----- xen/drivers/pci/Makefile | 2 +- xen/drivers/pci/compat.c | 65 ---------------------------------------- xen/include/xen/ioport.h | 8 ++--- 7 files changed, 14 insertions(+), 96 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index ef62fc4a5a..dad82476d0 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -26,7 +26,7 @@ static struct { static unsigned char keypress_key; -void keypress_softirq(void) +static void keypress_softirq(void) { keyhandler_t *h; unsigned char key = keypress_key; @@ -93,7 +93,7 @@ static void halt_machine(unsigned char key, struct xen_regs *regs) machine_restart(NULL); } -void do_task_queues(unsigned char key) +static void do_task_queues(unsigned char key) { struct domain *d; s_time_t now = NOW(); diff --git a/xen/common/physdev.c b/xen/common/physdev.c index cd4d2811e3..516479c0b8 100644 --- a/xen/common/physdev.c +++ b/xen/common/physdev.c @@ -704,7 +704,7 @@ string_param("physdev_dom0_hide", opt_physdev_dom0_hide); /* Test if boot params specify this device should NOT be visible to DOM0 * (e.g. so that another domain can control it instead) */ -int pcidev_dom0_hidden(struct pci_dev *dev) +static int pcidev_dom0_hidden(struct pci_dev *dev) { char cmp[10] = "(.......)"; diff --git a/xen/common/resource.c b/xen/common/resource.c index 8df57772a6..3ce6d89c97 100644 --- a/xen/common/resource.c +++ b/xen/common/resource.c @@ -253,19 +253,6 @@ struct resource * __request_region(struct resource *parent, unsigned long start, return res; } -int __check_region(struct resource *parent, unsigned long start, unsigned long n) -{ - struct resource * res; - - res = __request_region(parent, start, n, "check-region"); - if (!res) - return -EBUSY; - - release_resource(res); - xfree(res); - return 0; -} - void __release_region(struct resource *parent, unsigned long start, unsigned long n) { struct resource **p; diff --git a/xen/common/sched_bvt.c b/xen/common/sched_bvt.c index 6f0a79fad1..edad59ca18 100644 --- a/xen/common/sched_bvt.c +++ b/xen/common/sched_bvt.c @@ -159,7 +159,7 @@ static inline u32 calc_evt(struct domain *d, u32 avt) * * Returns non-zero on failure. */ -int bvt_alloc_task(struct domain *d) +static int bvt_alloc_task(struct domain *d) { if ( (d->sched_priv = xmem_cache_alloc(dom_info_cache)) == NULL ) return -1; @@ -170,7 +170,7 @@ int bvt_alloc_task(struct domain *d) /* * Add and remove a domain */ -void bvt_add_task(struct domain *d) +static void bvt_add_task(struct domain *d) { struct bvt_dom_info *inf = BVT_INFO(d); ASSERT(inf != NULL); @@ -206,7 +206,7 @@ void bvt_add_task(struct domain *d) } } -int bvt_init_idle_task(struct domain *p) +static int bvt_init_idle_task(struct domain *p) { if ( bvt_alloc_task(p) < 0 ) return -1; @@ -220,7 +220,7 @@ int bvt_init_idle_task(struct domain *p) return 0; } -void bvt_wake(struct domain *d) +static void bvt_wake(struct domain *d) { struct bvt_dom_info *inf = BVT_INFO(d); struct domain *curr; @@ -271,14 +271,14 @@ static void bvt_sleep(struct domain *d) * bvt_free_task - free BVT private structures for a task * @d: task */ -void bvt_free_task(struct domain *d) +static void bvt_free_task(struct domain *d) { ASSERT(d->sched_priv != NULL); xmem_cache_free(dom_info_cache, d->sched_priv); } /* Control the scheduler. */ -int bvt_ctl(struct sched_ctl_cmd *cmd) +static int bvt_ctl(struct sched_ctl_cmd *cmd) { struct bvt_ctl *params = &cmd->u.bvt; @@ -291,7 +291,7 @@ int bvt_ctl(struct sched_ctl_cmd *cmd) } /* Adjust scheduling parameter for a given domain. */ -int bvt_adjdom( +static int bvt_adjdom( struct domain *d, struct sched_adjdom_cmd *cmd) { struct bvt_adjdom *params = &cmd->u.bvt; @@ -526,7 +526,7 @@ static void bvt_dump_cpu_state(int i) } /* Initialise the data structures. */ -int bvt_init_scheduler() +static int bvt_init_scheduler(void) { int i; diff --git a/xen/drivers/pci/Makefile b/xen/drivers/pci/Makefile index 040d5aaccd..f2580105df 100644 --- a/xen/drivers/pci/Makefile +++ b/xen/drivers/pci/Makefile @@ -4,7 +4,7 @@ include $(BASEDIR)/Rules.mk -OBJS := pci.o quirks.o compat.o names.o setup-res.o +OBJS := pci.o quirks.o names.o setup-res.o #obj-$(CONFIG_PCI) += pci.o quirks.o compat.o names.o #obj-$(CONFIG_PROC_FS) += proc.o diff --git a/xen/drivers/pci/compat.c b/xen/drivers/pci/compat.c index 61e14b0a84..e69de29bb2 100644 --- a/xen/drivers/pci/compat.c +++ b/xen/drivers/pci/compat.c @@ -1,65 +0,0 @@ -/* - * $Id: compat.c,v 1.1 1998/02/16 10:35:50 mj Exp $ - * - * PCI Bus Services -- Function For Backward Compatibility - * - * Copyright 1998--2000 Martin Mares - */ - -#include -//#include -#include - -int -pcibios_present(void) -{ - return !list_empty(&pci_devices); -} - -int -pcibios_find_class(unsigned int class, unsigned short index, unsigned char *bus, unsigned char *devfn) -{ - const struct pci_dev *dev = NULL; - int cnt = 0; - - while ((dev = pci_find_class(class, dev))) - if (index == cnt++) { - *bus = dev->bus->number; - *devfn = dev->devfn; - return PCIBIOS_SUCCESSFUL; - } - return PCIBIOS_DEVICE_NOT_FOUND; -} - - -int -pcibios_find_device(unsigned short vendor, unsigned short device, unsigned short index, - unsigned char *bus, unsigned char *devfn) -{ - const struct pci_dev *dev = NULL; - int cnt = 0; - - while ((dev = pci_find_device(vendor, device, dev))) - if (index == cnt++) { - *bus = dev->bus->number; - *devfn = dev->devfn; - return PCIBIOS_SUCCESSFUL; - } - return PCIBIOS_DEVICE_NOT_FOUND; -} - -#define PCI_OP(rw,size,type) \ -int pcibios_##rw##_config_##size (unsigned char bus, unsigned char dev_fn, \ - unsigned char where, unsigned type val) \ -{ \ - struct pci_dev *dev = pci_find_slot(bus, dev_fn); \ - if (!dev) return PCIBIOS_DEVICE_NOT_FOUND; \ - return pci_##rw##_config_##size(dev, where, val); \ -} - -PCI_OP(read, byte, char *) -PCI_OP(read, word, short *) -PCI_OP(read, dword, int *) -PCI_OP(write, byte, char) -PCI_OP(write, word, short) -PCI_OP(write, dword, int) diff --git a/xen/include/xen/ioport.h b/xen/include/xen/ioport.h index 0416edc71e..b39d07ae32 100644 --- a/xen/include/xen/ioport.h +++ b/xen/include/xen/ioport.h @@ -100,17 +100,13 @@ extern int allocate_resource(struct resource *root, struct resource *new, #define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name)) #define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name)) -extern struct resource * __request_region(struct resource *, unsigned long start, unsigned long n, const char *name); - -/* Compatibility cruft */ -#define check_region(start,n) __check_region(&ioport_resource, (start), (n)) #define release_region(start,n) __release_region(&ioport_resource, (start), (n)) -#define check_mem_region(start,n) __check_region(&iomem_resource, (start), (n)) #define release_mem_region(start,n) __release_region(&iomem_resource, (start), (n)) -extern int __check_region(struct resource *, unsigned long, unsigned long); extern void __release_region(struct resource *, unsigned long, unsigned long); +extern struct resource * __request_region(struct resource *, unsigned long start, unsigned long n, const char *name); + #define get_ioport_list(buf) get_resource_list(&ioport_resource, buf, PAGE_SIZE) #define get_mem_list(buf) get_resource_list(&iomem_resource, buf, PAGE_SIZE) -- 2.30.2